Dynamic Shovels: support old and new supervisor child ID formats on 3.11.x #10080
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
During a rolling upgrade, all cluster nodes collectively may (and usually will, due to Shovel migration during node restarts) contain mirrored_supervisor children with IDs that use two different parameters (see referenced commits below). The old format should not trip up node startup, so new nodes must accept it in a few places, and try to use these older values during dynamic Shovel spec cleanup. References ccc22cb, 5f0981c, rabbitmq#9785. See rabbitmq#9894. (cherry picked from commit 2ce0307) # Conflicts: # deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
So that they do not make it to Khepri. (cherry picked from commit 28741cd)
Before 3.13.0, 3.12.8 and 3.11.25 supervisor id format was different. Don't start a shovel with the new id format if one exists with the old id format.
Because the clause `({{_, N}, _, _, _}) -> N =:= Name;` matches both
new and old id format but always returns false for old id format,
`child_exists` also returned false for old ids.
Also rename SupId to ChildId to be pedantically correct.
12 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
v3.11.25 contains a backport of a change that modified the supervisor child ids of dynamic shovel workers.
This is a backport of #9919, #9965 and #9968 to v3.11.x from 3.12.x that together fixed the situation.
An alternative would be to just revert the id format to the old one and somehow "withdraw" versions 3.11.25 and 3.11.26 (or say that it is not possible to upgrade to 3.12.0..3.12.7 from those versions)
Types of Changes
What types of changes does your code introduce to this project?
Put an
xin the boxes that applyChecklist
Put an
xin the boxes that apply.You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.
CONTRIBUTING.mddocumentFurther Comments
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc.